Skip to contentSkip to conversation

Change in openvpn[release/2.6]: GHA: Pin version of CMake for MinGW build

Openvpn-devel In review flichtenheld (Code Review) 2 participants 6 messages Apr 2, 2025 – Apr 4, 2025 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): gerrit.1743589873000.Ief11d5d7ccae084c863b50054d4e97c71f57d6f0@...2715...

#1 lore raw

Attention is currently required from: cron2, plaisthos.

Hello plaisthos,

I'd like you to do a code review.
Please visit

    http://gerrit.openvpn.net/c/openvpn/+/930?usp=email

to review the following change.

Change subject: GHA: Pin version of CMake for MinGW build
......................................................................

GHA: Pin version of CMake for MinGW build

Turns out that "apt install cmake" is useless since Github installs also CMake but not as a package. So make sure we control which CMake we get and not Github.

Switch to get-cmake action (which also installs ninja) and remove the installation via apt.

Backport from master but much more limited since we do not have Android nor AWS LC builds in release/2.6.

Change-Id Ief11d5d7ccae084c863b50054d4e97c71f57d6f0

Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg31299.html

(cherry picked from commit da65c4fdde20e36df38a90c1f1ef1d8ebf486c28)

---
M .github/workflows/build.yaml

1 file changed, 2 insertions(+), 1 deletion(-)

git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/30/930/1

.github/workflows/build.yaml +2 -1
index 5b1c797..37ac6ec 100644
@@ -47,10 +47,11 @@
       VCPKG_ROOT: ${{ github.workspace }}/vcpkg
     steps:
       - name: Install dependencies
-        run: sudo apt update && sudo apt install -y mingw-w64 unzip cmake ninja-build build-essential wget python3-docutils man2html-base
+        run: sudo apt update && sudo apt install -y mingw-w64 unzip build-essential wget python3-docutils man2html-base
       - name: Checkout OpenVPN
         uses: actions/[email protected]... # v4.2.2
 
+      - uses: lukka/[email protected]... # v3.31.6
       - name: Restore from cache and install vcpkg
         uses: lukka/[email protected]... # v11.5
         with:

--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/930?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings

Gerrit-Project: openvpn
Gerrit-Branch: release/2.6
Gerrit-Change-Id: Ief11d5d7ccae084c863b50054d4e97c71f57d6f0
Gerrit-Change-Number: 930
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: cron2 <[email protected]...>
Gerrit-MessageType: newchange

#2 lore raw
In reply to a message not in the archive

Attention is currently required from: flichtenheld, plaisthos.

cron2 has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/930?usp=email )

Change subject: GHA: Pin version of CMake for MinGW build
......................................................................

Patch Set 1: Code-Review+2

(1 comment)

Patchset:

PS1:
GHA says this is fine (and it relects the change in master)

--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/930?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings

Gerrit-Project: openvpn
Gerrit-Branch: release/2.6
Gerrit-Change-Id: Ief11d5d7ccae084c863b50054d4e97c71f57d6f0
Gerrit-Change-Number: 930
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Wed, 02 Apr 2025 15:25:44 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

#3 lore raw

PATCH 1/1 GHA: Pin version of CMake for MinGW build

In reply to a message not in the archive

From: Frank Lichtenheld <[email protected]...>

Turns out that "apt install cmake" is useless since Github installs also CMake but not as a package. So make sure we control which CMake we get and not Github.

Switch to get-cmake action (which also installs ninja) and remove the installation via apt.

Backport from master but much more limited since we do not have Android nor AWS LC builds in release/2.6.

Change-Id Ief11d5d7ccae084c863b50054d4e97c71f57d6f0

Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg31299.html

(cherry picked from commit da65c4fdde20e36df38a90c1f1ef1d8ebf486c28)

---

This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to release/2.6.

Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/930
This mail reflects revision 1 of this Change.

Acked-by according to Gerrit (reflected above):
Gert Doering <[email protected]...>

.github/workflows/build.yaml +2 -1
index 5b1c797..37ac6ec 100644
@@ -47,10 +47,11 @@
       VCPKG_ROOT: ${{ github.workspace }}/vcpkg
     steps:
       - name: Install dependencies
-        run: sudo apt update && sudo apt install -y mingw-w64 unzip cmake ninja-build build-essential wget python3-docutils man2html-base
+        run: sudo apt update && sudo apt install -y mingw-w64 unzip build-essential wget python3-docutils man2html-base
       - name: Checkout OpenVPN
         uses: actions/[email protected]... # v4.2.2
 
+      - uses: lukka/[email protected]... # v3.31.6
       - name: Restore from cache and install vcpkg
         uses: lukka/[email protected]... # v11.5
         with:
#4 lore raw

[Openvpn-devel] [PATCH applied] Re: GHA: Pin version of CMake for MinGW build

Fairly straightforward backport of the master commit da65c4fd (master has Android build, so that commit is longer). Tested via GHA push that built fine.

Your patch has been applied to the release/2.6 branch.

commit ca61164a10580baca96b2be8c53883023151aca5

Author: Frank Lichtenheld
Date:   Wed Apr 2 17:32:44 2025 +0200
     GHA: Pin version of CMake for MinGW build

     Signed-off-by: Frank Lichtenheld <[email protected]...>
     Acked-by: Gert Doering <[email protected]...>
     Message-Id: <[email protected]...>
     URL: https://www.mail-archive.com/[email protected]/msg31299.html
     Signed-off-by: Gert Doering <[email protected]...>
     Acked-by: Gert Doering <[email protected]...>
     Message-Id: <[email protected]...>
     URL: https://www.mail-archive.com/search?l=mid&[email protected]...
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering

#5 lore raw
In reply to a message not in the archive

cron2 has uploaded a new patch set (#2) to the change originally created by flichtenheld. ( http://gerrit.openvpn.net/c/openvpn/+/930?usp=email )

The following approvals got outdated and were removed:
Code-Review+2 by cron2

Change subject: GHA: Pin version of CMake for MinGW build
......................................................................

GHA: Pin version of CMake for MinGW build

Turns out that "apt install cmake" is useless since Github installs also CMake but not as a package. So make sure we control which CMake we get and not Github.

Switch to get-cmake action (which also installs ninja) and remove the installation via apt.

Backport from master but much more limited since we do not have Android nor AWS LC builds in release/2.6.

Change-Id Ief11d5d7ccae084c863b50054d4e97c71f57d6f0

Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg31299.html

(cherry picked from commit da65c4fdde20e36df38a90c1f1ef1d8ebf486c28)

Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/search?l=mid&[email protected]...

---
M .github/workflows/build.yaml

1 file changed, 2 insertions(+), 1 deletion(-)

git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/30/930/2

.github/workflows/build.yaml +2 -1
index 5b1c797..37ac6ec 100644
@@ -47,10 +47,11 @@
       VCPKG_ROOT: ${{ github.workspace }}/vcpkg
     steps:
       - name: Install dependencies
-        run: sudo apt update && sudo apt install -y mingw-w64 unzip cmake ninja-build build-essential wget python3-docutils man2html-base
+        run: sudo apt update && sudo apt install -y mingw-w64 unzip build-essential wget python3-docutils man2html-base
       - name: Checkout OpenVPN
         uses: actions/[email protected]... # v4.2.2
 
+      - uses: lukka/[email protected]... # v3.31.6
       - name: Restore from cache and install vcpkg
         uses: lukka/[email protected]... # v11.5
         with:

--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/930?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings

Gerrit-Project: openvpn
Gerrit-Branch: release/2.6
Gerrit-Change-Id: Ief11d5d7ccae084c863b50054d4e97c71f57d6f0
Gerrit-Change-Number: 930
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: newpatchset

#6 lore raw
In reply to a message not in the archive

cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/930?usp=email )

Change subject: GHA: Pin version of CMake for MinGW build
......................................................................

GHA: Pin version of CMake for MinGW build

Turns out that "apt install cmake" is useless since Github installs also CMake but not as a package. So make sure we control which CMake we get and not Github.

Switch to get-cmake action (which also installs ninja) and remove the installation via apt.

Backport from master but much more limited since we do not have Android nor AWS LC builds in release/2.6.

Change-Id Ief11d5d7ccae084c863b50054d4e97c71f57d6f0

Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg31299.html

(cherry picked from commit da65c4fdde20e36df38a90c1f1ef1d8ebf486c28)

Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/search?l=mid&[email protected]...

---
M .github/workflows/build.yaml

1 file changed, 2 insertions(+), 1 deletion(-)
.github/workflows/build.yaml +2 -1
index 5b1c797..37ac6ec 100644
@@ -47,10 +47,11 @@
       VCPKG_ROOT: ${{ github.workspace }}/vcpkg
     steps:
       - name: Install dependencies
-        run: sudo apt update && sudo apt install -y mingw-w64 unzip cmake ninja-build build-essential wget python3-docutils man2html-base
+        run: sudo apt update && sudo apt install -y mingw-w64 unzip build-essential wget python3-docutils man2html-base
       - name: Checkout OpenVPN
         uses: actions/[email protected]... # v4.2.2
 
+      - uses: lukka/[email protected]... # v3.31.6
       - name: Restore from cache and install vcpkg
         uses: lukka/[email protected]... # v11.5
         with:

--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/930?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings

Gerrit-Project: openvpn
Gerrit-Branch: release/2.6
Gerrit-Change-Id: Ief11d5d7ccae084c863b50054d4e97c71f57d6f0
Gerrit-Change-Number: 930
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: merged